Usenet 1993 July

home *** CD-ROM | disk | FTP | other *** search

/ Usenet 1993 July / InfoMagic USENET CD-ROM July 1993.ISO / sources / x / volume6 / xfig2 / patch6.2 < prev next >

Wrap

Internet Message Format | 1993-04-28 | 56.9 KB

From: envbvs@epb2.lbl.gov (Brian V. Smith) Newsgroups: comp.sources.x Subject: v06i082: xfig 2.0, Patch6, Part02/06 Message-ID: <134788@sun.Eng.Sun.COM> Date: 24 Apr 90 22:25:50 GMT Approved: argv@sun.com Submitted-by: envbvs@epb2.lbl.gov (Brian V. Smith) Posting-number: Volume 6, Issue 82 Archive-name: xfig2/patch6.2 Patch-To: xfig2: Volume 6, Issues: 9-24, 34-36, 50-56 #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of archive 2 (of 6)." # Contents: CHANGES.diff Imakefile.diff addpt.c.diff char.c.diff # copy.c.diff ellipse.c.diff f2ps.c.diff global.c.diff main.c.diff # move.c.diff msgsw.c.diff popup.c.diff printfonts.c.diff # scale.c.diff util.c.diff # Wrapped by envbvs@epb2.lbl.gov on Tue Apr 24 11:56:45 1990 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'CHANGES.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'CHANGES.diff'\" else echo shar: Extracting \"'CHANGES.diff'\" $4138 characters$ sed "s/^X//" >'CHANGES.diff' <<'END_OF_FILE' X*** CHANGES.old Tue Apr 24 11:48:02 1990 X--- CHANGES Tue Apr 24 11:33:30 1990 X*************** X*** 1,6 **** X Version 2.0 X X! Patchlevel 5 X Changes from patchlevel 4: X X o Line widths of zero now allowed for drawing borderless objects X--- 1,40 ---- X Version 2.0 X X! Patchlevel 6 X! Changes from patchlevel 5: X! X! o *** New popup menu to change characteristics of existing objects, X! e.g. line thickness, style, text options, area fill etc. X! Not ALL things may be modified yet (e.g. arrows on lines). X! Jon Tombs and Frank Schmuck provided this much-needed feature X! o Because the popup menu uses the new Simple Menu widget from R4, xfig X! will no longer compile under R3 X! o Fixed WMHints to "or" in InputHint to retain any existing Hints X! Thanks to David Elliott X! o Doesn't let one delete to fewer than 3 points in interpolated spline X! o Removed unused variables X! o Changed rounded-corner box objects to have radius component instead X! of using the pen component (new protocol version 2.0 and 2.0-TFX) X! o Added back support to read protocol version 1.3 files X! o Fixed bug where the line style wasn't passed in drawing bounding X! rectangle when moving/copying objects X! o Fixed cursor for popup command menu X! o Fixed bounding box bug for postscript output from f2ps X! o Fixed bug that erroneously allowed filled polylines (only polygons, boxes, X! round-corner boxes, ellipses, circles, closed splines and arcs may be filled) X! o Fixed name of AvantGarde-Book font (was AvantGarde) X! o Added two X fonts that are similar to AvantGarde... and Palatino... X! From Dave Davey X! o Fixed bug that caused coredump when referencing a zero-radius ellipse X! o Added back the LaTex buttons even for non-TFX mode X! o More SYSV #ifdefs from Scott E. Garfinkle (dacseg@uts.amdahl.com) X! o New rule in Imakefile to install troff_ft_codes file X! o put_fmsg() uses double arguments instead of float to prevent some X! systems from choking on float-double-float conversions of invalid data. X! o 8-bit characters allowed for text objects X! From Tor Lillqvist <tml@hemuli.tik.vtt.fi> X! X! Patchlevel 5 (3/27/90) X Changes from patchlevel 4: X X o Line widths of zero now allowed for drawing borderless objects X*************** X*** 25,31 **** X o line width and font support for f2p (pic) X Thanks to Dave Davey for these additions X X! Patchlevel 4 X Changes from patchlevel 3: X X o Bug fixed in drawing zero-length lines with arrows X--- 59,65 ---- X o line width and font support for f2p (pic) X Thanks to Dave Davey for these additions X X! Patchlevel 4 (3/12/90) X Changes from patchlevel 3: X X o Bug fixed in drawing zero-length lines with arrows X*************** X*** 53,59 **** X o Drawing too-narrow ellipses doesn't loop forever anymore, but they X are still not drawn correctly X X! Patchlevel 3 X Changes from patchlevel 2: X X o now uses XtAddTimer instead of setitimer() for blinking cursor X--- 87,93 ---- X o Drawing too-narrow ellipses doesn't loop forever anymore, but they X are still not drawn correctly X X! Patchlevel 3 (2/28/90) X Changes from patchlevel 2: X X o now uses XtAddTimer instead of setitimer() for blinking cursor X*************** X*** 62,68 **** X o added put_fmsg() to print messages with floating point numbers X Some machines (MIPS) were dumping core when passing floats as ints. X X! Patchlevel 2 X Changes from patchlevel 1: X X o removed call to free() in curve() which was causing coredumps X--- 96,102 ---- X o added put_fmsg() to print messages with floating point numbers X Some machines (MIPS) were dumping core when passing floats as ints. X X! Patchlevel 2 (2/23/90) X Changes from patchlevel 1: X X o removed call to free() in curve() which was causing coredumps X*************** X*** 69,75 **** X o Imakefile had .o filenames in SRCS definition X X X! Patchlevel 1 X Changes from patchlevel 0: X X o included definition of put_msg()/FREE/CFREE in f2ps.c X--- 103,109 ---- X o Imakefile had .o filenames in SRCS definition X X X! Patchlevel 1 (2/20/90) X Changes from patchlevel 0: X X o included definition of put_msg()/FREE/CFREE in f2ps.c END_OF_FILE if test 4138 -ne `wc -c <'CHANGES.diff'`; then echo shar: \"'CHANGES.diff'\" unpacked with wrong size! fi # end of 'CHANGES.diff' fi if test -f 'Imakefile.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'Imakefile.diff'\" else echo shar: Extracting \"'Imakefile.diff'\" $3153 characters$ sed "s/^X//" >'Imakefile.diff' <<'END_OF_FILE' X*** Imakefile.old Tue Apr 24 11:48:04 1990 X--- Imakefile Fri Apr 13 14:56:21 1990 X*************** X*** 1,11 **** X! SYS_LIBRARIES = -lm X! DEPLIBS = XawClientDepLibs X! LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) X X X XFIGSRC = addpt.c arc.c arcbox.c arrow.c autoarrow.c bitmap.c\ X! blink.c bound.c box.c break.c canvas.c changestyle.c\ X! changetext.c changethick.c char.c color.c copy.c\ X cursor.c curve.c deletept.c dir.c drag.c draw.c\ X ellipse.c file.c flip.c font.c free.c geom.c\ X global.c glue.c graphics.c grid.c intspline.c\ X--- 1,15 ---- X! SYS_LIBRARIES= -lm X! DEPLIBS = XawClientDepLibs X! LOCAL_LIBRARIES = XawClientLibs X! FONTFILE = troff_ft_codes X! FONTLIBDIR = /usr/lib/X11/troff X! DEFINES = -DFONTFILE=\"$(FONTFILE)\"\ X! -DFONTLIBDIR=\"$(FONTLIBDIR)\" X X X XFIGSRC = addpt.c arc.c arcbox.c arrow.c autoarrow.c bitmap.c\ X! blink.c bound.c box.c break.c canvas.c change.c\ X! color.c char.c copy.c\ X cursor.c curve.c deletept.c dir.c drag.c draw.c\ X ellipse.c file.c flip.c font.c free.c geom.c\ X global.c glue.c graphics.c grid.c intspline.c\ X*************** X*** 16,23 **** X spline.c text.c trans.c turn.c undo.c util.c xtra.c X X XFIGOBJ = addpt.o arc.o arcbox.o arrow.o autoarrow.o bitmap.o\ X! blink.o bound.o box.o break.o canvas.o changestyle.o\ X! changetext.o changethick.o char.o color.o copy.o\ X cursor.o curve.o deletept.o dir.o drag.o draw.o\ X ellipse.o file.o flip.o font.o free.o geom.o global.o\ X glue.o graphics.o grid.o intspline.o latex_line.o\ X--- 20,27 ---- X spline.c text.c trans.c turn.c undo.c util.c xtra.c X X XFIGOBJ = addpt.o arc.o arcbox.o arrow.o autoarrow.o bitmap.o\ X! blink.o bound.o box.o break.o canvas.o change.o\ X! color.o char.o copy.o\ X cursor.o curve.o deletept.o dir.o drag.o draw.o\ X ellipse.o file.o flip.o font.o free.o geom.o global.o\ X glue.o graphics.o grid.o intspline.o latex_line.o\ X*************** X*** 27,37 **** X rotate.o ruler.o save.o scale.o search.o spline.o\ X text.o trans.o turn.o undo.o util.o xtra.o X X! F2PSRC = arrow.c f2p.c free.c read.c troff_fonts.c psfonts.c X! F2POBJ = arrow.o f2p.o free.o read.o troff_fonts.o psfonts.o X X! F2PSSRC = arrow.c bound.c f2ps.c free.c read.c psfonts.c X! F2PSOBJ = arrow.o bound.o f2ps.o free.o read.o psfonts.o X X SRCS1 = $(XFIGSRC) X OBJS1 = $(XFIGOBJ) X--- 31,41 ---- X rotate.o ruler.o save.o scale.o search.o spline.o\ X text.o trans.o turn.o undo.o util.o xtra.o X X! F2PSRC = arrow.c f2p.c free.c read.c read1_3.c troff_fonts.c psfonts.c X! F2POBJ = arrow.o f2p.o free.o read.o read1_3.o troff_fonts.o psfonts.o X X! F2PSSRC = arrow.c bound.c f2ps.c free.c read.c read1_3.c psfonts.c X! F2PSOBJ = arrow.o bound.o f2ps.o free.o read.o read1_3.o psfonts.o X X SRCS1 = $(XFIGSRC) X OBJS1 = $(XFIGOBJ) X*************** X*** 47,49 **** X--- 51,60 ---- X ComplexProgramTarget_2(f2p,,) X X ComplexProgramTarget_3(f2ps,,) X+ X+ install:: $(DESTDIR)$(FONTLIBDIR) X+ X+ $(DESTDIR)$(FONTLIBDIR): X+ mkdir $(DESTDIR)$(FONTLIBDIR) X+ X+ InstallNonExec(troff_ft_codes,$(DESTDIR)$(FONTLIBDIR)/$(FONTFILE)) END_OF_FILE if test 3153 -ne `wc -c <'Imakefile.diff'`; then echo shar: \"'Imakefile.diff'\" unpacked with wrong size! fi # end of 'Imakefile.diff' fi if test -f 'addpt.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'addpt.c.diff'\" else echo shar: Extracting \"'addpt.c.diff'\" $2911 characters$ sed "s/^X//" >'addpt.c.diff' <<'END_OF_FILE' X*** addpt.c.old Tue Apr 24 11:48:05 1990 X--- addpt.c Mon Apr 16 11:19:12 1990 X*************** X*** 93,99 **** X { X find_endpoints(cur_spline->points, px, py, &left_point, &right_point); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X cur_x = px; cur_y = py; X if (left_point == NULL && closed_spline(cur_spline)) { X /* The added_point is between the 1st and 2nd point. */ X--- 93,99 ---- X { X find_endpoints(cur_spline->points, px, py, &left_point, &right_point); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X cur_x = px; cur_y = py; X if (left_point == NULL && closed_spline(cur_spline)) { X /* The added_point is between the 1st and 2nd point. */ X*************** X*** 182,188 **** X { X find_endpoints(cur_line->points,px,py,&left_point,&right_point); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X cur_x = fix_x = px; cur_y = fix_y = py; X if (left_point == NULL && cur_line->type == T_POLYGON) { X left_point = right_point; X--- 182,188 ---- X { X find_endpoints(cur_line->points,px,py,&left_point,&right_point); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X cur_x = fix_x = px; cur_y = fix_y = py; X if (left_point == NULL && cur_line->type == T_POLYGON) { X left_point = right_point; X*************** X*** 189,195 **** X right_point = right_point->next; X } X if (left_point != NULL && right_point != NULL) X! pw_vector(canvas_pixwin, left_point->x, left_point->y, X right_point->x, right_point->y, INV_PAINT, X cur_line->thickness, cur_line->style, cur_line->style_val); X draw_addedlink(INV_PAINT); X--- 189,195 ---- X right_point = right_point->next; X } X if (left_point != NULL && right_point != NULL) X! pw_vector(canvas_win, left_point->x, left_point->y, X right_point->x, right_point->y, INV_PAINT, X cur_line->thickness, cur_line->style, cur_line->style_val); X draw_addedlink(INV_PAINT); X*************** X*** 231,238 **** X wrapup_pointadding(); X } X X! mm_fix_linepoint_adding(x, y) X! int x, y; X { X F_point *p; X X--- 231,237 ---- X wrapup_pointadding(); X } X X! mm_fix_linepoint_adding() X { X F_point *p; X X*************** X*** 311,321 **** X int op; X { X if (left_point != NULL) { X! pw_vector(canvas_pixwin, left_point->x, left_point->y, X cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X if (right_point != NULL) { X! pw_vector(canvas_pixwin, right_point->x, X right_point->y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X } X--- 310,320 ---- X int op; X { X if (left_point != NULL) { X! pw_vector(canvas_win, left_point->x, left_point->y, X cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X if (right_point != NULL) { X! pw_vector(canvas_win, right_point->x, X right_point->y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X } END_OF_FILE if test 2911 -ne `wc -c <'addpt.c.diff'`; then echo shar: \"'addpt.c.diff'\" unpacked with wrong size! fi # end of 'addpt.c.diff' fi if test -f 'char.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'char.c.diff'\" else echo shar: Extracting \"'char.c.diff'\" $4234 characters$ sed "s/^X//" >'char.c.diff' <<'END_OF_FILE' X*** char.c.old Tue Apr 24 11:48:11 1990 X--- char.c Wed Apr 18 09:35:11 1990 X*************** X*** 14,20 **** X X extern int cur_x, cur_y; X extern int cur_font, cur_fontsize; X! extern int cur_texttype; X X #define BLINK_INTERVAL 700 /* milliseconds blink rate */ X #define BUF_SIZE 400 X--- 14,20 ---- X X extern int cur_x, cur_y; X extern int cur_font, cur_fontsize; X! extern int cur_textjust; X X #define BLINK_INTERVAL 700 /* milliseconds blink rate */ X #define BUF_SIZE 400 X*************** X*** 44,50 **** X int (*cr)(); X int bx, by; X { X- char c; X pw = p; X cr_proc = cr; X rbase_x = obase_x = cbase_x = bx; /* keep real base so dont have roundoff */ X--- 44,49 ---- X*************** X*** 84,90 **** X } X X char_handler(c) X! char c; X { X int cwidth; X X--- 83,89 ---- X } X X char_handler(c) X! unsigned char c; X { X int cwidth; X X*************** X*** 97,110 **** X erase_char_string(); X char_received = 1; X cwidth = char_advance(canvas_font,prefix[leng_prefix-1]); X! if (cur_texttype == T_LEFT_JUSTIFIED) X rcur_x -= cwidth; /* move the suffix to the left */ X! else if (cur_texttype == T_CENTER_JUSTIFIED) X { X rbase_x += cwidth/2.0; /* advance right by half cwidth */ X rcur_x -= cwidth/2.0; /* move suffix left half cwidth */ X } X! if (cur_texttype == T_RIGHT_JUSTIFIED) X rbase_x += (float) cwidth; /* move the prefix to the right */ X prefix[--leng_prefix] = '\0'; X cbase_x = rbase_x; /* fix */ X--- 96,109 ---- X erase_char_string(); X char_received = 1; X cwidth = char_advance(canvas_font,prefix[leng_prefix-1]); X! if (cur_textjust == T_LEFT_JUSTIFIED) X rcur_x -= cwidth; /* move the suffix to the left */ X! else if (cur_textjust == T_CENTER_JUSTIFIED) X { X rbase_x += cwidth/2.0; /* advance right by half cwidth */ X rcur_x -= cwidth/2.0; /* move suffix left half cwidth */ X } X! if (cur_textjust == T_RIGHT_JUSTIFIED) X rbase_x += (float) cwidth; /* move the prefix to the right */ X prefix[--leng_prefix] = '\0'; X cbase_x = rbase_x; /* fix */ X*************** X*** 116,128 **** X if (leng_prefix > 0) { X erase_char_string(); X char_received = 1; X! if (cur_texttype == T_CENTER_JUSTIFIED) X { X while (leng_prefix--) /* subtract half of the character widths */ X rcur_x -= char_advance(canvas_font,prefix[leng_prefix])/2.0; X cur_x = cbase_x = rbase_x = rcur_x ; X } X! else if (cur_texttype == T_RIGHT_JUSTIFIED) X cbase_x = rbase_x = cur_x = rcur_x; X else X cur_x = rcur_x = cbase_x = rbase_x; X--- 115,127 ---- X if (leng_prefix > 0) { X erase_char_string(); X char_received = 1; X! if (cur_textjust == T_CENTER_JUSTIFIED) X { X while (leng_prefix--) /* subtract half of the character widths */ X rcur_x -= char_advance(canvas_font,prefix[leng_prefix])/2.0; X cur_x = cbase_x = rbase_x = rcur_x ; X } X! else if (cur_textjust == T_RIGHT_JUSTIFIED) X cbase_x = rbase_x = cur_x = rcur_x; X else X cur_x = rcur_x = cbase_x = rbase_x; X*************** X*** 139,152 **** X else { X erase_char_string(); X cwidth = char_advance(canvas_font,c); X! if (cur_texttype == T_LEFT_JUSTIFIED) X rcur_x += cwidth; /* move the suffix to the right */ X! else if (cur_texttype == T_CENTER_JUSTIFIED) X { X rbase_x -= cwidth/2.0; /* advance left by half cwidth */ X rcur_x += cwidth/2.0; /* move suffix right half cwidth */ X } X! if (cur_texttype == T_RIGHT_JUSTIFIED) X rbase_x -= cwidth; /* move the prefix to the left */ X char_received = 1; X prefix[leng_prefix++] = c; X--- 138,151 ---- X else { X erase_char_string(); X cwidth = char_advance(canvas_font,c); X! if (cur_textjust == T_LEFT_JUSTIFIED) X rcur_x += cwidth; /* move the suffix to the right */ X! else if (cur_textjust == T_CENTER_JUSTIFIED) X { X rbase_x -= cwidth/2.0; /* advance left by half cwidth */ X rcur_x += cwidth/2.0; /* move suffix right half cwidth */ X } X! if (cur_textjust == T_RIGHT_JUSTIFIED) X rbase_x -= cwidth; /* move the prefix to the left */ X char_received = 1; X prefix[leng_prefix++] = c; END_OF_FILE if test 4234 -ne `wc -c <'char.c.diff'`; then echo shar: \"'char.c.diff'\" unpacked with wrong size! fi # end of 'char.c.diff' fi if test -f 'copy.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'copy.c.diff'\" else echo shar: Extracting \"'copy.c.diff'\" $2905 characters$ sed "s/^X//" >'copy.c.diff' <<'END_OF_FILE' X*** copy.c.old Tue Apr 24 11:48:11 1990 X--- copy.c Mon Apr 16 11:19:50 1990 X*************** X*** 63,69 **** X compound = copy_compound(c); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X clean_up(); X set_action_object(F_CREATE, O_COMPOUND); X insert_compound(&objects.compounds, compound); X--- 63,69 ---- X compound = copy_compound(c); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X clean_up(); X set_action_object(F_CREATE, O_COMPOUND); X insert_compound(&objects.compounds, compound); X*************** X*** 74,80 **** X line = copy_line(l); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X clean_up(); X set_action_object(F_CREATE, O_POLYLINE); X insert_line(&objects.lines, line); X--- 74,80 ---- X line = copy_line(l); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X clean_up(); X set_action_object(F_CREATE, O_POLYLINE); X insert_line(&objects.lines, line); X*************** X*** 95,101 **** X ellipse = copy_ellipse(e); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X clean_up(); X set_action_object(F_CREATE, O_ELLIPSE); X insert_ellipse(&objects.ellipses, ellipse); X--- 95,101 ---- X ellipse = copy_ellipse(e); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X clean_up(); X set_action_object(F_CREATE, O_ELLIPSE); X insert_ellipse(&objects.ellipses, ellipse); X*************** X*** 106,112 **** X arc = copy_arc(a); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X clean_up(); X set_action_object(F_CREATE, O_ARC); X insert_arc(&objects.arcs, arc); X--- 106,112 ---- X arc = copy_arc(a); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X clean_up(); X set_action_object(F_CREATE, O_ARC); X insert_arc(&objects.arcs, arc); X*************** X*** 117,123 **** X spline = copy_spline(s); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X clean_up(); X set_action_object(F_CREATE, O_SPLINE); X insert_spline(&objects.splines, spline); X--- 117,123 ---- X spline = copy_spline(s); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X clean_up(); X set_action_object(F_CREATE, O_SPLINE); X insert_spline(&objects.splines, spline); END_OF_FILE if test 2905 -ne `wc -c <'copy.c.diff'`; then echo shar: \"'copy.c.diff'\" unpacked with wrong size! fi # end of 'copy.c.diff' fi if test -f 'ellipse.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'ellipse.c.diff'\" else echo shar: Extracting \"'ellipse.c.diff'\" $2492 characters$ sed "s/^X//" >'ellipse.c.diff' <<'END_OF_FILE' X*** ellipse.c.old Tue Apr 24 11:48:14 1990 X--- ellipse.c Mon Apr 16 11:25:22 1990 X*************** X*** 50,57 **** X center_marker(x, y) X int x, y; X { X! pw_vector(canvas_pixwin, x, y-2, x, y+2, INV_PAINT, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_pixwin, x-2, y, x+2, y, INV_PAINT, 1, SOLID_LINE, 0.0); X } X X ellipsebyradius_drawing_selected() X--- 50,57 ---- X center_marker(x, y) X int x, y; X { X! pw_vector(canvas_win, x, y-2, x, y+2, INV_PAINT, 1, SOLID_LINE, 0.0); X! pw_vector(canvas_win, x-2, y, x+2, y, INV_PAINT, 1, SOLID_LINE, 0.0); X } X X ellipsebyradius_drawing_selected() X*************** X*** 122,129 **** X ellipse->angle = cur_angle; X ellipse->color = cur_color; X ellipse->depth = 0; X! ellipse->pen = NULL; X! /* added 3/1/89 B.V.Smith */ X ellipse->area_fill = fill_mode? cur_areafill : 0; X ellipse->direction = 1; X ellipse->center.x = fix_x; X--- 122,128 ---- X ellipse->angle = cur_angle; X ellipse->color = cur_color; X ellipse->depth = 0; X! ellipse->pen = 0; X ellipse->area_fill = fill_mode? cur_areafill : 0; X ellipse->direction = 1; X ellipse->center.x = fix_x; X*************** X*** 275,281 **** X y1 = fix_y + radius; X y2 = fix_y - radius; X draw_rectbox(x1, y1, x2, y2, op); X! pw_vector(canvas_pixwin, fix_x, fix_y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X X create_circlebyrad(x, y) X--- 274,280 ---- X y1 = fix_y + radius; X y2 = fix_y - radius; X draw_rectbox(x1, y1, x2, y2, op); X! pw_vector(canvas_win, fix_x, fix_y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X X create_circlebyrad(x, y) X*************** X*** 368,374 **** X y1 = fix_y + ry + radius; X y2 = fix_y + ry - radius; X draw_rectbox(x1, y1, x2, y2, op); X! pw_vector(canvas_pixwin, fix_x, fix_y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X X create_circlebydia(x, y) X--- 367,373 ---- X y1 = fix_y + ry + radius; X y2 = fix_y + ry - radius; X draw_rectbox(x1, y1, x2, y2, op); X! pw_vector(canvas_win, fix_x, fix_y, cur_x, cur_y, op, 1, SOLID_LINE, 0.0); X } X X create_circlebydia(x, y) X*************** X*** 421,427 **** X X a = e->radiuses.x; X b = e->radiuses.y; X! curve(canvas_pixwin, a, 0, a, 0, e->direction, (b*b), (a*a), X e->center.x, e->center.y, op, X e->thickness, e->style, e->style_val, e->area_fill); X } X--- 420,426 ---- X X a = e->radiuses.x; X b = e->radiuses.y; X! curve(canvas_win, a, 0, a, 0, e->direction, (b*b), (a*a), X e->center.x, e->center.y, op, X e->thickness, e->style, e->style_val, e->area_fill); X } END_OF_FILE if test 2492 -ne `wc -c <'ellipse.c.diff'`; then echo shar: \"'ellipse.c.diff'\" unpacked with wrong size! fi # end of 'ellipse.c.diff' fi if test -f 'f2ps.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'f2ps.c.diff'\" else echo shar: Extracting \"'f2ps.c.diff'\" $3612 characters$ sed "s/^X//" >'f2ps.c.diff' <<'END_OF_FILE' X*** f2ps.c.old Tue Apr 24 11:48:15 1990 X--- f2ps.c Mon Apr 23 14:44:04 1990 X*************** X*** 20,26 **** X #define DEFAULT_FONT_SIZE 11 X #define DEFAULT_FONT "Times-Roman" X X! extern struct _fstruct fontnames[]; /* printer font names */ X X char Usage[] = "Usage: %s [-P][-L][-f font][-s size][-e scale][-N][-c] [input [output]]\n"; X char *prog; X--- 20,26 ---- X #define DEFAULT_FONT_SIZE 11 X #define DEFAULT_FONT "Times-Roman" X X! extern struct _fstruct fontnames[]; /* printer font names */ X X char Usage[] = "Usage: %s [-P][-L][-f font][-s size][-e scale][-N][-c] [input [output]]\n"; X char *prog; X*************** X*** 35,41 **** X double reduction; /* converts screen ppi to printer points */ X extern int num_object; X char *from = NULL, *to = NULL; X! FILE *ffp = NULL, *tfp = NULL; X char Err_incomp[] = "Incomplete %s object at line %d."; X char Err_mem[] = "Running out of memory."; X X--- 35,41 ---- X double reduction; /* converts screen ppi to printer points */ X extern int num_object; X char *from = NULL, *to = NULL; X! FILE *tfp = NULL; X char Err_incomp[] = "Incomplete %s object at line %d."; X char Err_mem[] = "Running out of memory."; X X*************** X*** 110,116 **** X { X F_compound objects; X int status; X- char c; X X get_args(argc, argv); X X--- 110,115 ---- X*************** X*** 212,218 **** X fprintf(tfp, "%%%%For: %s@%s (%s)\n", X who->pw_name, host, who->pw_gecos); X fprintf(tfp, "%%%%Pages: %d\n", show_page); X! fprintf(tfp, "%%%%BoundingBox: %d %d %d %d\n", llx, lly, urx, ury); X fprintf(tfp, "%%%%EndComments\n"); X fprintf(tfp, "%s\n", BEGIN_PROLOG); X if (ellipse_exist(objects)) X--- 211,218 ---- X fprintf(tfp, "%%%%For: %s@%s (%s)\n", X who->pw_name, host, who->pw_gecos); X fprintf(tfp, "%%%%Pages: %d\n", show_page); X! fprintf(tfp, "%%%%BoundingBox: %d %d %d %d\n", llx, X! PAGE_HEIGHT-lly, urx, PAGE_HEIGHT-ury); X fprintf(tfp, "%%%%EndComments\n"); X fprintf(tfp, "%s\n", BEGIN_PROLOG); X if (ellipse_exist(objects)) X*************** X*** 270,276 **** X origx = tx - llx; X if (landscape) X origx=0; X! /*origx -= (dx-llx);*/ X urx = (llx=tx) + dx; X ury = (PAGE_HEIGHT + dy) / 2.0; X if (coord_system == 2) X--- 270,276 ---- X origx = tx - llx; X if (landscape) X origx=0; X! origx -= (dx-llx); X urx = (llx=tx) + dx; X ury = (PAGE_HEIGHT + dy) / 2.0; X if (coord_system == 2) X*************** X*** 406,412 **** X return; X X set_linewidth(l->thickness); X! radius = l->pen; /* radius of rounded-corner boxes */ X p = l->points; X q = p->next; X if (q == NULL) { /* A single point line */ X--- 406,412 ---- X return; X X set_linewidth(l->thickness); X! radius = l->radius; /* radius of rounded-corner boxes */ X p = l->points; X q = p->next; X if (q == NULL) { /* A single point line */ X*************** X*** 523,529 **** X fprintf(tfp, "\t%.3f %.3f %.3f %.3f %d %d curveto\n", X a->rx, a->ry, b->lx, b->ly, q->x, q->y); X a = b; X- b = b->next; X } X if (closed_spline(s)) X { X--- 523,528 ---- X*************** X*** 582,588 **** X fprintf(tfp, "%% Closed spline\n"); X fprintf(tfp, "newpath %.3f %.3f moveto\n", a, b); X } X! for (q = p->next; q != NULL; p = q, q = q->next) { X x1 = x3; y1 = y3; X x2 = c; y2 = d; X c = q->x; d = q->y; X--- 581,587 ---- X fprintf(tfp, "%% Closed spline\n"); X fprintf(tfp, "newpath %.3f %.3f moveto\n", a, b); X } X! for (q = p->next; q != NULL; q = q->next) { X x1 = x3; y1 = y3; X x2 = c; y2 = d; X c = q->x; d = q->y; END_OF_FILE if test 3612 -ne `wc -c <'f2ps.c.diff'`; then echo shar: \"'f2ps.c.diff'\" unpacked with wrong size! fi # end of 'f2ps.c.diff' fi if test -f 'global.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'global.c.diff'\" else echo shar: Extracting \"'global.c.diff'\" $3407 characters$ sed "s/^X//" >'global.c.diff' <<'END_OF_FILE' X*** global.c.old Tue Apr 24 11:48:18 1990 X--- global.c Tue Apr 17 16:34:40 1990 X*************** X*** 27,33 **** X int fix_x, fix_y; X int cur_x, cur_y; X X- int receiving_msg = 0; X int action_on = 0; X int pointmarker_shown = 0; X int compoundbox_shown = 0; X--- 27,32 ---- X*************** X*** 34,49 **** X X int ICON_COLUMN; X int CANVAS_HEIGHT, CANVAS_WIDTH; X! int CANVAS_LEFT, CANVAS_TOP; X! int PANEL_LEFT, PANEL_TOP, PANEL_HEIGHT, PANEL_WID; X! int PANEL2_LEFT, PANEL2_TOP, PANEL2_HEIGHT, PANEL2_WID; X! int MSG_LEFT, MSG_TOP, MSG_WIDTH; X! int SIDERULER_LEFT, SIDERULER_TOP; X int SIDERULER_WIDTH, SIDERULER_HEIGHT; X- int SIDERULER_START; X- int TOPRULER_LEFT, TOPRULER_TOP; X int TOPRULER_WIDTH, TOPRULER_HEIGHT; X- int borderwid, windowspacing, toolstripeht; X X int num_point; X F_point *first_point, *cur_point; X--- 33,41 ---- X X int ICON_COLUMN; X int CANVAS_HEIGHT, CANVAS_WIDTH; X! int PANEL_WID, PANEL2_WID; X int SIDERULER_WIDTH, SIDERULER_HEIGHT; X int TOPRULER_WIDTH, TOPRULER_HEIGHT; X X int num_point; X F_point *first_point, *cur_point; X*************** X*** 110,128 **** X float cur_angle = 0.0; X int cur_color = BLACK; X int cur_textstyle = PLAIN; X! int cur_texttype = T_LEFT_JUSTIFIED; X! /* line thicknesses for each gc */ X! int gc_thickness[0x10] = {1,1,1,1,1,1,1,1, X! 1,1,1,1,1,1,1,1}; X! int gc_line_style[0x10] = {-1,-1,-1,-1,-1,-1,-1,-1, X! -1,-1,-1,-1,-1,-1,-1,-1}; X! short dot_image[16] = { X! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, X! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, X! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, X! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, X! }; X! mpr_static(dot, 16, 16, 1, dot_image); X X /************************* Flags/Resources *******************************/ X X--- 102,111 ---- X float cur_angle = 0.0; X int cur_color = BLACK; X int cur_textstyle = PLAIN; X! int cur_textjust = T_LEFT_JUSTIFIED; X! /* line thicknesses for each gc */ X! int gc_thickness[NUMOPS] = {-1,-1,-1,-1}; X! int gc_line_style[NUMOPS] = {-1,-1,-1,-1}; X X /************************* Flags/Resources *******************************/ X X*************** X*** 134,140 **** X X /************************ Status ****************************/ X X! char directory[128] = ""; X char current_file[200] = ""; X int cur_printer=0; X char *printer=""; X--- 117,123 ---- X X /************************ Status ****************************/ X X! char directory[1024]; X char current_file[200] = ""; X int cur_printer=0; X char *printer=""; X*************** X*** 169,181 **** X X reset_cursor() X { X! XDefineCursor(tool_d, canvas_swfd, (Cursor)cur_cursor->bitmap); X } X X set_temp_cursor(cursor) X CURSOR cursor; X { X! XDefineCursor(tool_d, canvas_swfd, (Cursor)cursor->bitmap); X } X X set_cursor(cursor) X--- 152,164 ---- X X reset_cursor() X { X! XDefineCursor(tool_d, canvas_win, (Cursor)cur_cursor->bitmap); X } X X set_temp_cursor(cursor) X CURSOR cursor; X { X! XDefineCursor(tool_d, canvas_win, (Cursor)cursor->bitmap); X } X X set_cursor(cursor) X*************** X*** 182,188 **** X CURSOR cursor; X { X cur_cursor = cursor; X! XDefineCursor(tool_d, canvas_swfd, (Cursor)cursor->bitmap); X } X X set_lastaxis(a) X--- 165,171 ---- X CURSOR cursor; X { X cur_cursor = cursor; X! XDefineCursor(tool_d, canvas_win, (Cursor)cursor->bitmap); X } X X set_lastaxis(a) END_OF_FILE if test 3407 -ne `wc -c <'global.c.diff'`; then echo shar: \"'global.c.diff'\" unpacked with wrong size! fi # end of 'global.c.diff' fi if test -f 'main.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'main.c.diff'\" else echo shar: Extracting \"'main.c.diff'\" $3454 characters$ sed "s/^X//" >'main.c.diff' <<'END_OF_FILE' X*** main.c.old Tue Apr 24 11:48:20 1990 X--- main.c Wed Apr 18 09:42:02 1990 X*************** X*** 13,29 **** X #include "resources.h" X #include "font.h" X X- extern int borderwid, windowspacing, toolstripeht; X extern int ICON_COLUMN; X extern int CANVAS_HEIGHT, CANVAS_WIDTH; X! extern int CANVAS_LEFT, CANVAS_TOP; X! extern int PANEL_LEFT, PANEL_TOP, PANEL_HEIGHT, PANEL_WID; X! extern int PANEL2_LEFT, PANEL2_TOP, PANEL2_HEIGHT, PANEL2_WID; X! extern int MSG_LEFT, MSG_TOP, MSG_WIDTH; X! extern int SIDERULER_LEFT, SIDERULER_TOP; X extern int SIDERULER_WIDTH, SIDERULER_HEIGHT; X- extern int SIDERULER_START; X- extern int TOPRULER_LEFT, TOPRULER_TOP; X extern int TOPRULER_WIDTH, TOPRULER_HEIGHT; X extern (*canvas_rightbut_proc)(); X extern set_popupmenu(); X--- 13,22 ---- X #include "resources.h" X #include "font.h" X X extern int ICON_COLUMN; X extern int CANVAS_HEIGHT, CANVAS_WIDTH; X! extern int PANEL_WID, PANEL2_WID; X extern int SIDERULER_WIDTH, SIDERULER_HEIGHT; X extern int TOPRULER_WIDTH, TOPRULER_HEIGHT; X extern (*canvas_rightbut_proc)(); X extern set_popupmenu(); X*************** X*** 35,41 **** X Pixmap fig_icon; X X static char tool_name[100] = " FIG : FACILITY FOR INTERACTIVE GENERATION OF FIGURES "; X- static RECT icon_rect, tool_rect; X static sigwinched(); X X /************** FIG options ******************/ X--- 28,33 ---- X*************** X*** 43,51 **** X extern appresStruct appres; X X TOOL tool; X- int WINDOW_WIDTH, WINDOW_HEIGHT; X char file_header[32] = "#FIG "; X! static char *file = NULL; X X static Boolean true = True; X static Boolean false = False; X--- 35,42 ---- X extern appresStruct appres; X X TOOL tool; X char file_header[32] = "#FIG "; X! static char *filename = NULL; X X static Boolean true = True; X static Boolean false = False; X*************** X*** 142,148 **** X { X if (*argv[i] != '-') /* search for non - name */ X { X! file = argv[i]; X break; X } X i++; X--- 133,139 ---- X { X if (*argv[i] != '-') /* search for non - name */ X { X! filename = argv[i]; X break; X } X i++; X*************** X*** 251,257 **** X X /* Set the input field to true to allow keyboard input */ X wmhints = XGetWMHints(tool_d, XtWindow(tool)); X! wmhints->flags = InputHint; X wmhints->input = True; X XSetWMHints(tool_d, XtWindow(tool),wmhints); X X--- 242,248 ---- X X /* Set the input field to true to allow keyboard input */ X wmhints = XGetWMHints(tool_d, XtWindow(tool)); X! wmhints->flags |= InputHint; /* add in input hint */ X wmhints->input = True; X XSetWMHints(tool_d, XtWindow(tool),wmhints); X X*************** X*** 292,297 **** X--- 283,289 ---- X } X X init_gc(); X+ init_fill_pm(); X init_fill_gc(); X show_fill_color(); X show_radius(); X*************** X*** 305,312 **** X show_line_thickness(); X put_msg("READY"); X canvas_rightbut_proc = set_popupmenu; X! if (file != NULL) X! edit_file(file); X (void)signal(SIGINT, SIG_IGN); /* so we don't lose work accidentally */ X fig_icon = XCreateBitmapFromData(tool_d, XtWindow(tool), X fig_bits, fig_width, fig_height); X--- 297,304 ---- X show_line_thickness(); X put_msg("READY"); X canvas_rightbut_proc = set_popupmenu; X! if (filename != NULL) X! edit_file(filename); X (void)signal(SIGINT, SIG_IGN); /* so we don't lose work accidentally */ X fig_icon = XCreateBitmapFromData(tool_d, XtWindow(tool), X fig_bits, fig_width, fig_height); END_OF_FILE if test 3454 -ne `wc -c <'main.c.diff'`; then echo shar: \"'main.c.diff'\" unpacked with wrong size! fi # end of 'main.c.diff' fi if test -f 'move.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'move.c.diff'\" else echo shar: Extracting \"'move.c.diff'\" $3594 characters$ sed "s/^X//" >'move.c.diff' <<'END_OF_FILE' X*** move.c.old Tue Apr 24 11:48:21 1990 X--- move.c Mon Apr 16 11:21:41 1990 X*************** X*** 65,71 **** X X if ((c = compound_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X! win_setmouseposition(canvas_swfd, px, py); X if (compoundbox_shown) draw_compoundbox(c, INV_PAINT); X erase_compound(c); X init_compounddragging(c, px, py); X--- 65,71 ---- X X if ((c = compound_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X! win_setmouseposition(canvas_win, px, py); X if (compoundbox_shown) draw_compoundbox(c, INV_PAINT); X erase_compound(c); X init_compounddragging(c, px, py); X*************** X*** 77,83 **** X else if ((l = line_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X erase_pointmarker(); X! win_setmouseposition(canvas_swfd, px, py); X draw_line(l, ERASE); X init_linedragging(l, px, py); X set_temp_cursor(&null_cursor); X--- 77,83 ---- X else if ((l = line_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X erase_pointmarker(); X! win_setmouseposition(canvas_win, px, py); X draw_line(l, ERASE); X init_linedragging(l, px, py); X set_temp_cursor(&null_cursor); X*************** X*** 97,103 **** X else X px = size.x; X } X! pw_text(canvas_pixwin, t->base_x - px, t->base_y, INV_PAINT, X t->font, t->size, t->cstring); X init_textdragging(t, x, y); X set_temp_cursor(&null_cursor); X--- 97,103 ---- X else X px = size.x; X } X! pw_text(canvas_win, t->base_x - px, t->base_y, INV_PAINT, X t->font, t->size, t->cstring); X init_textdragging(t, x, y); X set_temp_cursor(&null_cursor); X*************** X*** 109,115 **** X set_temp_cursor(&wait_cursor); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, px, py); X draw_ellipse(e, background_color); X init_ellipsedragging(e, px, py); X set_temp_cursor(&null_cursor); X--- 109,115 ---- X set_temp_cursor(&wait_cursor); X erase_pointmarker(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, px, py); X draw_ellipse(e, background_color); X init_ellipsedragging(e, px, py); X set_temp_cursor(&null_cursor); X*************** X*** 120,126 **** X else if ((a = arc_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X erase_pointmarker(); X! win_setmouseposition(canvas_swfd, px, py); X draw_arc(a, background_color); X init_arcdragging(a, px, py); X set_temp_cursor(&null_cursor); X--- 120,126 ---- X else if ((a = arc_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X erase_pointmarker(); X! win_setmouseposition(canvas_win, px, py); X draw_arc(a, background_color); X init_arcdragging(a, px, py); X set_temp_cursor(&null_cursor); X*************** X*** 130,136 **** X } X else if ((s = spline_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X! win_setmouseposition(canvas_swfd, px, py); X erase_pointmarker(); X draw_spline(s, ERASE); X init_splinedragging(s, px, py); X--- 130,136 ---- X } X else if ((s = spline_search(x, y, TOLERANCE, &px, &py)) != NULL) { X set_temp_cursor(&wait_cursor); X! win_setmouseposition(canvas_win, px, py); X erase_pointmarker(); X draw_spline(s, ERASE); X init_splinedragging(s, px, py); END_OF_FILE if test 3594 -ne `wc -c <'move.c.diff'`; then echo shar: \"'move.c.diff'\" unpacked with wrong size! fi # end of 'move.c.diff' fi if test -f 'msgsw.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'msgsw.c.diff'\" else echo shar: Extracting \"'msgsw.c.diff'\" $2876 characters$ sed "s/^X//" >'msgsw.c.diff' <<'END_OF_FILE' X*** msgsw.c.old Tue Apr 24 11:48:22 1990 X--- msgsw.c Fri Apr 20 14:35:15 1990 X*************** X*** 16,22 **** X #include "psfonts.h" X X extern int errno; X- extern int receiving_msg; X extern int action_on; X extern null_proc(); X X--- 16,21 ---- X*************** X*** 43,67 **** X X #define BUF_SIZE 80 X X- static (*msgsw_kbd_proc)(); X- static (*msgsw_leftbut_proc)(); X- static (*msgsw_rightbut_proc)(); X- static (*recipient)(); X- X- static char msg_received[BUF_SIZE]; X static char prompt[BUF_SIZE]; X- static int len_prompt; X- static int input_base_x; X X static msg_selected(); X static msg_sighandler(); X X- static (*saved_canvas_kbd_proc)(); X- static (*saved_canvas_locmove_proc)(); X- static (*saved_canvas_leftbut_proc)(); X- static (*saved_canvas_middlebut_proc)(); X- static (*saved_canvas_rightbut_proc)(); X- X static Arg msg_args[] = X { X /* 0 */ { XtNwidth, (XtArgVal) 0 }, X--- 42,52 ---- X*************** X*** 104,111 **** X addn_args[0].value = (XtArgVal)bold_font; X XtSetValues(msg_sw, addn_args, XtNumber(addn_args)); X } X! msgswfd = XtWindow(msg_sw); X! XDefineCursor(tool_d, msgswfd, (Cursor)pencil_cursor.bitmap); X } X X /*VARARGS1*/ X--- 89,96 ---- X addn_args[0].value = (XtArgVal)bold_font; X XtSetValues(msg_sw, addn_args, XtNumber(addn_args)); X } X! msg_win = XtWindow(msg_sw); X! XDefineCursor(tool_d, msg_win, (Cursor)pencil_cursor.bitmap); X } X X /*VARARGS1*/ X*************** X*** 123,129 **** X /*VARARGS1*/ X put_fmsg(format, arg1, arg2, arg3, arg4, arg5) X char *format; X! float arg1, arg2, arg3, arg4, arg5; X { X sprintf(prompt, format, arg1, arg2, arg3, arg4, arg5); X msg_args[2].value = (XtArgVal)prompt; X--- 108,114 ---- X /*VARARGS1*/ X put_fmsg(format, arg1, arg2, arg3, arg4, arg5) X char *format; X! double arg1, arg2, arg3, arg4, arg5; X { X sprintf(prompt, format, arg1, arg2, arg3, arg4, arg5); X msg_args[2].value = (XtArgVal)prompt; X*************** X*** 136,154 **** X XtSetValues(msg_sw, &msg_args[2], 1); X } X X- static X- end_char_input() X- { X- receiving_msg = 0; /* msg input has been received */ X- terminate_char_handler(); X- strcpy(&prefix[leng_prefix], suffix); X- strcpy(msg_received, prefix); X- strcpy(&prompt[len_prompt], prefix); X- if (recipient != NULL) (* recipient) (msg_received); X- restore_event_proc(); X- return; X- } X- X init_msg_receiving(msg_recipient, p) X int (*msg_recipient)(); X char *p; X--- 121,126 ---- X*************** X*** 158,172 **** X prompt_string(p, reply); X (*msg_recipient)(reply); X } X- X- restore_event_proc() X- { X- canvas_kbd_proc = saved_canvas_kbd_proc; X- canvas_locmove_proc = saved_canvas_locmove_proc; X- canvas_leftbut_proc = saved_canvas_leftbut_proc; X- canvas_middlebut_proc = saved_canvas_middlebut_proc; X- canvas_rightbut_proc = saved_canvas_rightbut_proc; X- } X X blink_msg() X { X--- 130,135 ---- END_OF_FILE if test 2876 -ne `wc -c <'msgsw.c.diff'`; then echo shar: \"'msgsw.c.diff'\" unpacked with wrong size! fi # end of 'msgsw.c.diff' fi if test -f 'popup.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'popup.c.diff'\" else echo shar: Extracting \"'popup.c.diff'\" $4222 characters$ sed "s/^X//" >'popup.c.diff' <<'END_OF_FILE' X*** popup.c.old Tue Apr 24 11:48:29 1990 X--- popup.c Mon Apr 16 11:22:21 1990 X*************** X*** 26,31 **** X--- 26,32 ---- X extern save_file(); X extern save_and_exit(); X extern write_bitmap(); X+ extern Reset_cursor(); X X /******************** local variables ***************************/ X X*************** X*** 43,61 **** X {MENU_IMAGESTRING, "Change Directory", (caddr_t) F_CHDIR}, X {MENU_IMAGESTRING, "Print Working Directory", (caddr_t) F_PWDIR}, X {MENU_IMAGESTRING, "Save & Quit", (caddr_t) F_SAVE_N_EXIT}, X- /* X {MENU_IMAGESTRING, "Save as BITMAP ..", (caddr_t) F_SAVE_BITMAP}, X- */ X }; X! static MENU menu_body = { X! MENU_IMAGESTRING, X! "commands", X! sizeof(pumenu_items)/sizeof(MENUITEM), X! pumenu_items, X! (MENU *) NULL, X! (caddr_t) NULL X! }; X! static MENU *menu_ptr = &menu_body; X static char quit_msg[] = "CONFIRM with LEFT button, CANCEL with RIGHT or MIDDLE button"; X static char edit_msg[] = "Figures are modified; please CONFIRM with LEFT button or CANCEL with RIGHT button"; X X--- 44,52 ---- X {MENU_IMAGESTRING, "Change Directory", (caddr_t) F_CHDIR}, X {MENU_IMAGESTRING, "Print Working Directory", (caddr_t) F_PWDIR}, X {MENU_IMAGESTRING, "Save & Quit", (caddr_t) F_SAVE_N_EXIT}, X {MENU_IMAGESTRING, "Save as BITMAP ..", (caddr_t) F_SAVE_BITMAP}, X }; X! X static char quit_msg[] = "CONFIRM with LEFT button, CANCEL with RIGHT or MIDDLE button"; X static char edit_msg[] = "Figures are modified; please CONFIRM with LEFT button or CANCEL with RIGHT button"; X X*************** X*** 81,86 **** X--- 72,91 ---- X { XtNcallback, (XtArgVal)pane_callbacks }, X }; X X+ XtActionsRec popup_actions[] = X+ { X+ { "Reset_cursor", (XtActionProc)Reset_cursor }, X+ }; X+ X+ Reset_cursor(tool, event, params, nparams) X+ TOOL tool; X+ XEvent *event; X+ String *params; X+ Cardinal *nparams; X+ { X+ reset_cursor(); X+ } X+ X TOOL menu; X X int X*************** X*** 97,106 **** X menu = XtCreatePopupShell("popup_menu", overrideShellWidgetClass, tool, X menu_args, XtNumber(menu_args)); X popdown_actions = XtParseTranslationTable( X! "<Btn3Up>:MenuPopdown()\n"); X! /* X! <LeaveWindow>:MenuPopdown()\n"); X! */ X XtOverrideTranslations(menu, popdown_actions); X panes = XtCreateManagedWidget("menu", boxWidgetClass, menu, menu_args, X XtNumber(menu_args)); X--- 102,109 ---- X menu = XtCreatePopupShell("popup_menu", overrideShellWidgetClass, tool, X menu_args, XtNumber(menu_args)); X popdown_actions = XtParseTranslationTable( X! "<Btn3Up>:MenuPopdown()Reset_cursor()\n"); X! /*<LeaveWindow>:MenuPopdown()Reset_cursor()\n");*/ X XtOverrideTranslations(menu, popdown_actions); X panes = XtCreateManagedWidget("menu", boxWidgetClass, menu, menu_args, X XtNumber(menu_args)); X*************** X*** 107,112 **** X--- 110,116 ---- X pane_actions = XtParseTranslationTable( X "<EnterWindow>:set()\n\ X <Btn3Up>:notify()unset()\n"); X+ XtAddActions(popup_actions, XtNumber(popup_actions)); X for (i = 0; i < XtNumber(pumenu_items); i++) X { X mi = &pumenu_items[i]; X*************** X*** 154,160 **** X { X } X X! void pane_select(widget, mi) X TOOL widget; X MENUITEM *mi; X { X--- 158,165 ---- X { X } X X! void X! pane_select(widget, mi) X TOOL widget; X MENUITEM *mi; X { X*************** X*** 214,219 **** X--- 219,225 ---- X init_msg_receiving(write_bitmap, "Save bitmap to file : "); X break; X } X+ Reset_cursor(); X XtPopdown(menu); X } X X*************** X*** 227,233 **** X tool_destroy(tool); X exit(0); X } X! if (wmgr_confirm(canvas_swfd, quit_msg) == -1) { X tool_destroy(tool); X exit(0); X } X--- 233,239 ---- X tool_destroy(tool); X exit(0); X } X! if (wmgr_confirm(canvas_win, quit_msg) == -1) { X tool_destroy(tool); X exit(0); X } X*************** X*** 252,258 **** X edit() X { X if (!no_object() && figure_modified) X! if (wmgr_confirm(canvas_swfd, edit_msg) != -1) X return; X init_msg_receiving(edit_file, "Edit file : "); X } X--- 258,264 ---- X edit() X { X if (!no_object() && figure_modified) X! if (wmgr_confirm(canvas_win, edit_msg) != -1) X return; X init_msg_receiving(edit_file, "Edit file : "); X } END_OF_FILE if test 4222 -ne `wc -c <'popup.c.diff'`; then echo shar: \"'popup.c.diff'\" unpacked with wrong size! fi # end of 'popup.c.diff' fi if test -f 'printfonts.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'printfonts.c.diff'\" else echo shar: Extracting \"'printfonts.c.diff'\" $2898 characters$ sed "s/^X//" >'printfonts.c.diff' <<'END_OF_FILE' X*** printfonts.c.old Tue Apr 24 11:48:30 1990 X--- printfonts.c Thu Apr 12 15:47:46 1990 X*************** X*** 18,37 **** X extern Pixmap font_menu_bitmaps[]; X extern struct _fstruct fontnames[]; /* font names */ X X /******************** local variables ***************************/ X X static MENUITEM fontmenu_items[NUMFONTS]; X X- static MENU fontmenu_body = { X- MENU_IMAGESTRING, X- "printerfonts", X- sizeof(fontmenu_items)/sizeof(MENUITEM), X- fontmenu_items, X- (MENU *) NULL, X- (caddr_t) NULL X- }; X- static MENU *fontmenu_ptr = &fontmenu_body; X- X static Arg fontmenu_args[] = X { X { XtNvSpace, (XtArgVal) 1 }, X--- 18,32 ---- X extern Pixmap font_menu_bitmaps[]; X extern struct _fstruct fontnames[]; /* font names */ X X+ /* GLOBAL */ X+ X+ int *font_sel; /* pointer to store font selected from popup */ X+ TOOL image_widget; /* which widget to store image of font in */ X+ X /******************** local variables ***************************/ X X static MENUITEM fontmenu_items[NUMFONTS]; X X static Arg fontmenu_args[] = X { X { XtNvSpace, (XtArgVal) 1 }, X*************** X*** 87,93 **** X register int i; X register MENUITEM *mi; X XtTranslations popdown_actions, pane_actions; X- Arg my_list; X X fontmenu = XtCreatePopupShell("font_menu", overrideShellWidgetClass, tool, X fontmenu_args, XtNumber(fontmenu_args)); X--- 82,87 ---- X*************** X*** 105,111 **** X fontmenu_items[i].type = MENU_IMAGESTRING; /* put the fontnames in menu */ X fontmenu_items[i].label = fontnames[i].psfont; X fontmenu_items[i].info = (caddr_t) i; /* index for font # */ X- mi = &fontmenu_items[i]; X } X X main_pane_args[0].value = (XtArgVal)"Printer Fonts"; X--- 99,104 ---- X*************** X*** 143,149 **** X X setup_fontmenu() X { X- Arg psargs[2]; X register int i; X X /* Create the bitmaps */ X--- 136,141 ---- X*************** X*** 169,179 **** X X setup_fontmenu_cursor() X { X- register int i; X- X if (cursinit) /* already defined */ X return; X- X cursinit = 1; X /* Define the cursor for the main menu form */ X XDefineCursor(tool_d, XtWindow(fontpanes), (Cursor)arrow_cursor.bitmap); X--- 161,168 ---- X*************** X*** 184,194 **** X MENUITEM *mi; X { X char * font_name = mi->label; X X! font_button = (int) mi->info; X put_msg("Font: %s",font_name); X /* put image of font in indicator window */ X! psfont_args[6].value = (XtArgVal) font_menu_bitmaps[font_button]; X! XtSetValues(psfont, &psfont_args[6], 1); X XtPopdown(fontmenu); X } X--- 173,184 ---- X MENUITEM *mi; X { X char * font_name = mi->label; X+ Arg args[1]; X X! *font_sel = (int) mi->info; /* set current font to one selected */ X put_msg("Font: %s",font_name); X /* put image of font in indicator window */ X! XtSetArg(args[0], XtNbitmap, font_menu_bitmaps[*font_sel]); X! XtSetValues(image_widget, args, ONE); X XtPopdown(fontmenu); X } END_OF_FILE if test 2898 -ne `wc -c <'printfonts.c.diff'`; then echo shar: \"'printfonts.c.diff'\" unpacked with wrong size! fi # end of 'printfonts.c.diff' fi if test -f 'scale.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'scale.c.diff'\" else echo shar: Extracting \"'scale.c.diff'\" $2587 characters$ sed "s/^X//" >'scale.c.diff' <<'END_OF_FILE' X*** scale.c.old Tue Apr 24 11:48:39 1990 X--- scale.c Mon Apr 16 11:23:18 1990 X*************** X*** 73,79 **** X cosa = fabs(dx / l); sina = fabs(dy / l); X X fromx = cur_x; fromy = cur_y; X! win_setmouseposition(canvas_swfd, cur_x, cur_y); X draw_compoundbox(cmpnd, INV_PAINT); X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X set_latestcompound(cmpnd); X--- 73,79 ---- X cosa = fabs(dx / l); sina = fabs(dy / l); X X fromx = cur_x; fromy = cur_y; X! win_setmouseposition(canvas_win, cur_x, cur_y); X draw_compoundbox(cmpnd, INV_PAINT); X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X set_latestcompound(cmpnd); X*************** X*** 82,88 **** X canvas_leftbut_proc = canvas_rightbut_proc = null_proc; X set_action_on(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, x, y); X } X else if ((cmpnd = compound_search(x, y, TOLERANCE, &cur_x, &cur_y)) X != NULL ) X--- 82,88 ---- X canvas_leftbut_proc = canvas_rightbut_proc = null_proc; X set_action_on(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, x, y); X } X else if ((cmpnd = compound_search(x, y, TOLERANCE, &cur_x, &cur_y)) X != NULL ) X*************** X*** 130,136 **** X break; X } X /* erase the compound box. */ X! win_setmouseposition(canvas_swfd, cur_x, cur_y); X draw_compoundbox(cmpnd, INV_PAINT); X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X set_latestcompound(cmpnd); X--- 130,136 ---- X break; X } X /* erase the compound box. */ X! win_setmouseposition(canvas_win, cur_x, cur_y); X draw_compoundbox(cmpnd, INV_PAINT); X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X set_latestcompound(cmpnd); X*************** X*** 139,145 **** X canvas_leftbut_proc = canvas_rightbut_proc = null_proc; X set_action_on(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_swfd, x, y); X } X } X X--- 139,145 ---- X canvas_leftbut_proc = canvas_rightbut_proc = null_proc; X set_action_on(); X set_temp_cursor(&null_cursor); X! win_setmouseposition(canvas_win, x, y); X } X } X X*************** X*** 149,155 **** X { X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X compute_adjustposition(x, y); X! win_setmouseposition(canvas_swfd, cur_x, cur_y); X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X } X X--- 149,155 ---- X { X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X compute_adjustposition(x, y); X! win_setmouseposition(canvas_win, cur_x, cur_y); X draw_rectbox(fix_x, fix_y, cur_x, cur_y, INV_PAINT); X } X END_OF_FILE if test 2587 -ne `wc -c <'scale.c.diff'`; then echo shar: \"'scale.c.diff'\" unpacked with wrong size! fi # end of 'scale.c.diff' fi if test -f 'util.c.diff' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'util.c.diff'\" else echo shar: Extracting \"'util.c.diff'\" $2703 characters$ sed "s/^X//" >'util.c.diff' <<'END_OF_FILE' X*** util.c.old Tue Apr 24 11:48:43 1990 X--- util.c Mon Apr 16 11:26:25 1990 X*************** X*** 161,169 **** X toggle_ellipsepointmarker(e) X F_ellipse *e; X { X! set_marker(canvas_pixwin, e->start.x-2, e->start.y-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X! set_marker(canvas_pixwin, e->end.x-2, e->end.y-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X } X X--- 161,169 ---- X toggle_ellipsepointmarker(e) X F_ellipse *e; X { X! set_marker(canvas_win, e->start.x-2, e->start.y-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X! set_marker(canvas_win, e->end.x-2, e->end.y-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X } X X*************** X*** 170,180 **** X toggle_arcpointmarker(a) X F_arc *a; X { X! set_marker(canvas_pixwin, a->point[0].x-2, a->point[0].y-2, 5, 5, X INV_PAINT, &pmarker, 0, 0); X! set_marker(canvas_pixwin, a->point[1].x-2, a->point[1].y-2, 5, 5, X INV_PAINT, &pmarker, 0, 0); X! set_marker(canvas_pixwin, a->point[2].x-2, a->point[2].y-2, 5, 5, X INV_PAINT, &pmarker, 0, 0); X } X X--- 170,180 ---- X toggle_arcpointmarker(a) X F_arc *a; X { X! set_marker(canvas_win, a->point[0].x-2, a->point[0].y-2, 5, 5, X INV_PAINT, &pmarker, 0, 0); X! set_marker(canvas_win, a->point[1].x-2, a->point[1].y-2, 5, 5, X INV_PAINT, &pmarker, 0, 0); X! set_marker(canvas_win, a->point[2].x-2, a->point[2].y-2, 5, 5, X INV_PAINT, &pmarker, 0, 0); X } X X*************** X*** 188,197 **** X fx = p->x; fy = p->y; X for (p = p->next; p!= NULL; p = p->next) { X x = p->x; y = p->y; X! set_marker(canvas_pixwin, x-2, y-2, 5, 5, INV_PAINT, &pmarker, 0, 0); X } X if (x != fx || y != fy) { X! set_marker(canvas_pixwin, fx-2, fy-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X } X } X--- 188,197 ---- X fx = p->x; fy = p->y; X for (p = p->next; p!= NULL; p = p->next) { X x = p->x; y = p->y; X! set_marker(canvas_win, x-2, y-2, 5, 5, INV_PAINT, &pmarker, 0, 0); X } X if (x != fx || y != fy) { X! set_marker(canvas_win, fx-2, fy-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X } X } X*************** X*** 206,215 **** X fx = p->x; fy = p->y; X for (p = p->next; p!= NULL; p = p->next) { X x = p->x; y = p->y; X! set_marker(canvas_pixwin, x-2, y-2, 5, 5, INV_PAINT, &pmarker, 0, 0); X } X if (x != fx || y != fy) { X! set_marker(canvas_pixwin, fx-2, fy-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X } X } X--- 206,215 ---- X fx = p->x; fy = p->y; X for (p = p->next; p!= NULL; p = p->next) { X x = p->x; y = p->y; X! set_marker(canvas_win, x-2, y-2, 5, 5, INV_PAINT, &pmarker, 0, 0); X } X if (x != fx || y != fy) { X! set_marker(canvas_win, fx-2, fy-2, 5, 5, INV_PAINT, X &pmarker, 0, 0); X } X } END_OF_FILE if test 2703 -ne `wc -c <'util.c.diff'`; then echo shar: \"'util.c.diff'\" unpacked with wrong size! fi # end of 'util.c.diff' fi echo shar: End of archive 2 $of 6$. cp /dev/null ark2isdone MISSING="" for I in 1 2 3 4 5 6 ; do if test ! -f ark${I}isdone ; then MISSING="${MISSING} ${I}" fi done if test "${MISSING}" = "" ; then echo You have unpacked all 6 archives. rm -f ark[1-9]isdone else echo You still need to unpack the following archives: echo " " ${MISSING} fi ## End of shell archive. exit 0 dan ----------------------------------------------------------- O'Reilly && Associates argv@sun.com / argv@ora.com 632 Petaluma Ave, Sebastopol, CA 95472 800-338-NUTS, in CA: 800-533-NUTS, FAX 707-829-0104 Opinions expressed reflect those of the author only.